From: Bryan Davis <bd808@wikimedia.org>
Date: Wed, 10 Dec 2014 18:08:18 +0000 (-0700)
Subject: hhvm: Check for tidy function instead of class
X-Git-Tag: 1.31.0-rc.0~13013
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=4f281083fda91879a77fb87d64d8a9533526bd0c;p=lhc%2Fweb%2Fwiklou.git

hhvm: Check for tidy function instead of class

Bug: T78166
Change-Id: Ie60e23ffbafd698a3458eed1efce92d54c8d0c2a
---

diff --git a/includes/parser/MWTidy.php b/includes/parser/MWTidy.php
index 7b699d21e5..8ec324ccba 100644
--- a/includes/parser/MWTidy.php
+++ b/includes/parser/MWTidy.php
@@ -246,7 +246,9 @@ class MWTidy {
 		global $wgTidyConf, $wgDebugTidy;
 		wfProfileIn( __METHOD__ );
 
-		if ( !class_exists( 'tidy' ) ) {
+		if ( !class_exists( 'tidy' ) ||
+			( wfIsHHVM() && !function_exists('tidy_repair_string') )
+		) {
 			wfWarn( "Unable to load internal tidy class." );
 			$retval = -1;